Revert commit 13df9d3