[zokier]

Well, this is not exactly cleaning up old legacy code. Its more of undoing a patch that should haven not been merged in the first place.