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

This reverts commit f991b7bb811548f41b06b84e28b7fdbd4f894ca5.