This reverts commit b0732bee96. Solution required PHP 7.0.7, thus breaking requirement of compatibility with PHP 5.4.
b0732bee96