Revert "Fix #224"

This reverts commit 9af2613244b3c3ba2d8a6084207a823c85857d25.