rollback changes from release preparation of 546536