AH-374 revert deferred changes,