we don't support py2.6, so let's remove the workarounds we have. Change-Id: Id9c8fda065d4aceba3192b044b5c5f2124ee204f