Revert "Merge pull request #102 from Eamyne/branch9"

This reverts commit 72b567aeb931be99f622023da6de72777333b117, reversing
changes made to 3545e59adb8e15e22d742c31f2953f9c66428b92.