Revert "Follow-up fix for bug#9327."

This reverts commit e067c961ec175c3bfae69ef7e661cd7551430fb8.