rollback changes from release preparation of 415555