manually revert #1277