Remove dependency cycle. Oops.