Revert #659