Revert "Broken, fixes nothing, disregard."

This reverts commit 6563243040abca2a495ce9e3f62380d69b2aa0d8.