Per #189, this seems to work best with our code base.