Porting Asa's change to public docs