ABORT ABORT
Revert "Merge pull request #71 from cmoon820/master"

This reverts commit a93e093de0d433acf05d215b277d9e0a6feb0a51, reversing
changes made to 37218a3ec419e7fa08326f7905571e63e95bb455.