Fix dependency layering issues caused by r180112.