Revert "a9 for compatibility with intentionally broken build guts"

This reverts commit 07ce959a5759b90463a1b341bc903baa9b84e73b.

Change-Id: I6753be23976fc17c31f63660659d3f56bb279c6a