Merge "Revert^2 "Ensure that methods requiring interpreter entrypoint always have it.""