Fix default encoding issue with PHP 5.4 (Part 2)
- Revert new functions on call with arguments