Revert "More entrypoint handling cleanup." This reverts commit 67e48ecc200bee6e4ac784c97446bb949fb20a9e. Reason for revert: Test failure on target. Change-Id: I94c96db18f79d7e214435b3e475586d8c5d0ab58