rollback changes from release preparation of 5411245