Remove temporary compatibility hack.

The callers have been fixed.

Bug: 18298106
Change-Id: I65e24032d0a82c4b118abace854d2dcdada881fb
Merge "Remove temporary compatibility hack."