Revert "Merge pull request #284 from andylyall/develop"

This reverts commit 640bbb3af0681101b758815c20e5183fcecc06b0, reversing
changes made to 46ee35887906d16e7a7d645af17b3b7ee432971f.