Eliminate dependency on MSL