Would need to add some kind of option to toggle this behavior if this were to be integrated with the core codebase; this push just removes the normal behavior and replaces it with the customized behavior.