rollback changes from release preparation of 676887