Revert "Merge pull request #160 from r3dunlop/master"

This reverts commit f8a132aa737d49e61938ac15067fdf7d1ae01614, reversing
changes made to 5e2c08a00299f2a1d76646037ddf00309e2a3daa.