This reverts commit 6f9e272d. A f*cking mess. See 1cdf6ade Change-Id: Ia66edb96c9c34742300e882c2796870bfd9919d1