Revert "Merge pull request #198 from monterail/single"

This reverts commit 7e70de1bf712aa7ca9e87e8fac78c9950a37c5f6, reversing
changes made to 54196193891d4043cac2b04c565eb3f7c6320cc8.