This is becoming extremely irritating. STOP CHANGING MY STUFF RIGHT AFTER I COMMIT DAMMIT

Change-Id: I5c6386caaa28b0640d428fef5dc9a216c29fb281