Revert "The /e modifier for preg_replace() is deprecated in PHP 5.5; replace with preg_replace_callback()"

Reverting because this has already been merged into 2.1 branch

This reverts commit c1e98b933091b1ce4c1597f1c8e931c062cd6608.