This reverts commit f9f285ae99. Some idiot (me) approved the previous commit against the advice at the end of the commit message. Change-Id: I70fbc4c9e31058f4a5b42c22120cd62b682c439f
f9f285ae99