Revert "Add r159136 back now that pr13124 has been fixed."