Revert #1487