k3: bring up to par with noonamer

This is messy, This shouldn't have happened.