This got lost during the revert.

(Hopefully) final fix for Bug: 12970