Rollback to previous state

Fix PHP 5.5 support