Revert "it works now, but at what cost???"

This reverts commit f71e2b1791fa423c9cdff869ac1eb518a019d2b7.