Revert commit 0760383a6b