Revert "Lets try this again"

This reverts commit 19ac3935eceb2212173e2ccdba330355f716ce5c.