Oops, I did forget bits of unwanted merged code