Revert "Merge branch 'issue133'"

This reverts commit 012874c93fe2b365771f20a6925470b3cbac420b, reversing
changes made to 9f62c4d3d84ea132b3cbdcddabf59cd9e7055168.