Simple-case dependency workaround removed.