Merge commit 'b1eac5edfbe4d0eb12c96d5da7ceeb54e290b1ad' * commit 'b1eac5edfbe4d0eb12c96d5da7ceeb54e290b1ad': Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29