Revert "Merge pull request #276 from soundnRg/master"

This reverts commit 80e06c15d5b9bc42c893f5c0a939ff87d887e433, reversing
changes made to 88d966c960622de5349483e0f4ed71e5f085498f.

Causing 800+ test failures.