This reverts commit 928ff038 Compiles with 4.6 now. Change-Id: Ib455da1098bb0e0623248be07579882a425fcbd1