Created by: floydpink
The workaround suggested on #436 seems to be something that could be pulled in to the repo itself.
// TODO: Add the tests suggested by @wting on that issue - after seeing the existing set of tests to continue to be succeeding on Travis CI