Replaced previous change with an alternative fix/workaround.