CL to revert ag/575031 for nova

for ijpedowitz@

Change-Id: Ic49a2ebddd045c0700460b821241fd7dc90d9ccd