Reverted 9bfa10f. The issues happens with both versions.