Revert "Revert https://github.com/Obnoxious/nefarious2/commit/a41e6fbc8fe877ac89a718b5fb8e2f1acdf5e907"

This reverts commit d0332a09ff8f7ed38f5cb1699581f405b7be31ad.