manually revert #1338