Lets do it again properly.

This reverts commit 5376f048.

Change-Id: Ibc7bf099f9d0e8a357b4b6f538fe193a9fb2b7e6