Looks like there is no need for this workaround. Windows and Linux now
behave the same way.