Cleanup after I457552b5017948d246becac6677c2e01464edc43

Change-Id: Icad8c24ea364dc03ef5b1d980c1e65cafc396063