Reverting merges

review @tleach