Hand-apply 63b62aa703c2628b27b577114081b265f237dadb from master;