Revert commit af23627