This reverts commit 12f191a690, reversing changes made to 49b3dc85c2. See #269.
12f191a690
49b3dc85c2