This is unmergable now + it will now break pjax loading without the rename