Revert "OK f*** it"

This reverts commit f5e2ecff2f179a9c4a8c7d6937670c92bb1f0457.