This reverts commit a3d70911. Reason for revert: this was fixed in cb637674 which moved the definition to a different line causing this change to merge cleanly, resulting in a duplicate. Change-Id: I2d8763f0e2af320f043a1417ba33e82f82163592
