Revert "Merge pull request #62 from bigamckay/wip/backend-commitments"

This reverts commit b13c68a59575a78657fdf080ee07a1ca259a311b, reversing
changes made to 5d35aa2df3c281f0611936ee5adcc9900e0300d4.
Revert "Merge pull request #61 from bigamckay/wip/test-fixes2"

This reverts commit 43f9ab105a12791374fee7c1c804cc8a98b1e173, reversing
changes made to 34d14ecc3be3eb6a3a65cf16a89c342c0f61ffb4.