To workaround issue #1325 and possibly #1320. This reverts commit 3a046e34111aeaf3701062f006e9f5957635e15b.