rollback changes from release preparation of 6656