Restore Randy's fix that I blew away in my merge with native menu branch.