Revert #1232