am fe4ca8e8: (-s ours) Revert "DO NOT MERGE. Only have a portable entrypoint in portable builds."

* commit 'fe4ca8e8c363ce4575e9e1c596379003a2618746':
  Revert "DO NOT MERGE. Only have a portable entrypoint in portable builds."