Actually legacify
Derps fixed

Change-Id: Ifcecb15f5352a2e2680e087b33e1a54217119d1e