Remove no longer needed code for PHP 5.2 compat

Change-Id: I9c1f5f12f51274c443084da55447d12b828a9fb0