Reverted change in how hack works (#12727, #12736)

The fix for Window slightly altered how the hack was done, breaking #12736

Change-Id: I2d33b45421c40ce011d2e728a573f7572e326c47