This change needs to be removed, or it will get into the official repo