Revert last commit.
Merge pull request #1039 from sylus/7.x-1.x

Revert last commit.