Revert commit from #1