rollback changes from release preparation of 5445