I don’t think we need to treat maven_layout specially any more.