Huh. Looks like I forgot to commit this cleanup from Oct 14