revert #1493701
5 files changed