Revert "[#290] Implement fix to #311 from @kindly"

This reverts commit d56583a6168e2c144759715a707c522e489d5af7.