Revert #218