Revert #1216