Fix pull request leftovers

oops :p

Change-Id: I04b6ba19bc0fbffffc96b8584bb2f5e06955f23b