Revert "Merge pull request #160 from BrianAdams/MergeTest"

This reverts commit b1887ee45b2876dfd968cdd8375f46ce6c1b42c4, reversing
changes made to df6b09b8d26b482bf1674171d75800298dc351a3.

This was a mistake. Not intended to be merged to master.