As per Simon's comment in the commit, this block still isn't necessary