Post-merge fixup

Change-Id: I799dc4c7629ff37083f85cd7fdb438ebd17284d8
Signed-off-by: Evan Anderson <evan@thelinuxman.us>