This actually fixes #7802.  It should really work this time.