Revert "Revert "much moar""

This reverts commit 22df305fa96c6fcda24013d047cec9f39ef93951.