Manually backported Wsat