Revert "Closed #169"

This reverts commit a9404914580ee6143861b7837592870f552414ed.