Don't create owner twice (this should go to -stable too)