Revert "Revert "Remove for now, not sure this will ever work""

This reverts commit 77f63d657918cb5359af2acf3411ab67efcfb312.