Revert "that didn't work" try again

This reverts commit 8848bf5a3d09271e3df02a2be156727ee65d4b15.