Revert Troy's commit. It causes a crash on startup here, I don't think it is just my system. Either way, unfortunately the proper solution isn't quite a one-liner.