Removing code in #541 led to lower overall coverage