@joshmoore This line will conflict with #671.