Meant to add these official bits a long time ago...