Revert "#112 updates"

This reverts commit e7051d670a422ccec6f9391b4ac4444212420039.