Revert #418