rollback changes from release preparation of 45222