This commit breaks the system, but I've pushed so that Matt can look at it.