Doing my best to manually remove nextime's plugin architecture while keeping his other changes.