Fix previous revert derp

Change-Id: I5531ba02dd5e1409942e5d2da306c24ac39d6c26