Remove heisenbug workarounds