Revert "Fix #4561 (revert #4430)" -- i.e. go back to modified #4430.

Revert "Fix #4561 (revert #4430)" -- i.e. go back to modified #4430. #785