derp in merge conflict from 3.4.11