Revert wrong fix #1109