I've already changed this to just be an override; I'm waiting on other builds to test before updating this pull request.