Revert #632