Try out Pers suggestion in #1473.