Legacy internal and client support for Menlo
