Revert "Fix compiling errors in P"

* A proper fix will be used instead

This reverts commit c4f92dd33b72fe8af5664dc589e07c9fb15efc3e.

Change-Id: I04c9f9d9e05cfc7942eea46ab56f7f94510ba63e
5 files changed