Revert one change from r8928 and instead apply the right answer: