rollback changes from release preparation of 7851425