Restored PHP 5.3 and 5.4 support