Revert my commits. Already fixed in master. FFS

This reverts commit 4d86e72d22e0197c89a895202a27ffd31f7b104e.
This reverts commit 64eed68a521831a104d97a97b9b953dbeb55d598.

Change-Id: I8895db50bf9571607c3892bddda6ea27e713f610