rollback changes from release preparation of 659884