This was missed by the merge as it doesn't cause any tests to fail (yet). Change-Id: I6d106279d31276817ea718fdef3d8199b80693f6