Revert "Revert "this won't work""

This reverts commit 3a2dd5bb88e836792523d91c650cb6837025b9ab.