Revert "None of this is used, prove me wrong" This reverts commit 673e5e351dc372e2cdb4b91f3fefcea3b8fd9990.