Revert "Refinements relating to invoke-custom"

Breaks dx tests.

This reverts commit ff80988c1d58ccc63f12e61cce1417c4f5239eee.

Change-Id: I822b6cfb81c99d2d92bb560b8cedfaea42913344
10 files changed