Fix merge conflict with ksundbergs branch (for realz)