Revert "This probably won't work, commiting it anyway"

This reverts commit 1055f6cc5cb73eddc805f065c0a3d4f0c67cdde0.