Revert "Merge pull request #6 from saml/sandwich"

This reverts commit 506aaeec18f9c6bcec00c702e369020d442788b7, reversing
changes made to 4f17fbb8f4c1ae4b31c2a8f09c0306e90c9486b7.