Revert "Initial work on #242"

This reverts commit 1a087e746637af668dbcc8c55f83fefdafda4495.