Revert "Merge pull request #88 from askeing/Bug_867031"

This reverts commit 49469de4063a797776230194c2da019f6a4bcdbf, reversing
changes made to 917cb23483a02eb70d5b86a1a4d2eae65adab2d4.

This was breaking builds, see Bug 872522