Make this work with current Mustache checkout