rollback changes from release preparation of 1.0.036266