Reverts regression mentioned at 3fe0022efa (commitcomment-23013504)
3fe0022efa (commitcomment-23013504)