Fixing mysterious regression of bugfix 8f6e335.