rollback changes from release preparation of 5549877