I'll need to test this PR with turbolinks... I know for sure that changing this to `page:load` will re-break the things this PR fixes, but it's entirely possible that the PR as it is will work with turbolinks.