We can now finally get rid of this evil thing!

This reverts commit 7dd22df2d6553212971b325ffac101f3dce719fa.

Change-Id: I9345f6f673b02c06514978bcb4b531c0675fddd0