Revert of r30457 per Micko (nw)