Revert "Merge pull request #902 from Mossop/bug855086"

This reverts commit 993dc9b7b4ce89cbc11336d2b1166622fc3ed5f3, reversing
changes made to 2354c294ac8db2a9efd6fec6479be47778baa345.