Similar comment to my previous -- should be able to remove this dependency.