Revert "remove workaround for 1.9.2"

This reverts commit 0e3e9d0032adf5b183f49d9d9c3c957d18dc5f68.