Remove conditional code now that we require PHP 5.4