rollback changes from release preparation of ffh676576