Revert PR #1554 because it's wrong.