Fix #8959 by reverting revision 80761.
16 files changed