Revert "Fix for #18"
Revert "Fix for #18"

This reverts commit cb7ed3e0ff61d234f7f2b4e9559491c4fab471f8.

boogie-org/corral,boogie-org/corral,boogie-org/corral,boogie-org/corral,boogie-org/corral,boogie-org/corral,boogie-org/corral