revert commit from Nov 23, 2012