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