Unfortunately this didn't work on > 9.3 in practice.
Merge pull request #483 from apenney/fix

Unfortunately this didn't work on > 9.3 in practice.