Revert "Merge pull request #286 from GunfighterJ/2.9"

This reverts commit 57de3f3ed2d6a42372156343021f876d8245d3e1, reversing
changes made to 76d1ea5cab0f0d994c344ec60dcd0b1b2a3631a7.