Revert "add a temporary fix until steve fix it :)"

This reverts commit 5906341f80834ba4d88a752c2c5f5ee458872ab8.

Change-Id: I255fa48fe587f8cec8720483779eb70b2f00ecb1