Revert "This probably will not work"

This reverts commit a2baaf303922741ebbdac3b0f10b5bc24f917cb3.