Ruffle some feathers

Change-Id: Ie8e6e7162d86c3d1c23bdf532c69c68411c2fb5b