Remove copy/paste job from six (with renamed APIs!)