Revert #606