This was previously deprecated for removal during the Wallaby release. Change-Id: I6a57aff7c95fafef64ab65192ec4ec804658b31f