revert #1527