Seems related to bug#20376