rollback changes from release preparation of 5422588