Revert commit d8606e5