Is there a reason we still have this API here? it seems like we don't actually want anyone to call this code.