sw: why the heck is that #ifdef'd out?

Change-Id: I213ad0f0ab853aec5cb523474218dfad2c44d11b