Revert, wrong branch

These changes should have gone in sl5.x-x86_64