Revert #1600 temporarily