Revert 368d004..96e4987

This rolls back to commit 368d0049ab71bc2d8a2fd93b21aa1ae3511b91ce.