Revert "Re #9179 Merging in recent master changes"

This reverts commit aedd1da61e74543f6f97ab8305a442e0f30b7491.
Re #9179 Merging in recent master changes - correctly this time