Revert to bf65fb4eca26c1cc96816815225cd411691a6a4a.
Adding refs.