This reverts commit 5526318062 because the underlying problem was fixed by 889b56c8cd. MFC after: 1 month
5526318062
889b56c8cd