This reverts commit ddbaa11e. Reapply the original commit, the broken test was repaired in 5e51363f in the meantime.