Revert "Merge pull request #152 from qadan/7.x"

This reverts commit 54cc7f1790fd808fc9f147e830d2d6581e95a99c, reversing
changes made to 3004d8b8ebfbf0d1ef0eb22ac738e9b72a71a827.