Revert "Merge branch 'pr/190'"

This reverts commit 457accf7296ddaf667bb67c4f58f9b684b99dce2, reversing
changes made to 9df9f75f64157e7cd20c995a575037128af798c1.