Revert commit aba7ea6 (Oct 24, 2013)