Revert

Reverted to 954c33931ad47e2710a311a44ebde22a1b2e951b on @Deavmi's
request