Revert "Merge pull request #112 from jordandukart/7.x"

This reverts commit 85f25a4054ec856bb47ae44211809f1a8bbec69b, reversing
changes made to f60d811c2bf5e3621f054692b9c14b086ff7fa48.
Merge pull request #113 from jordandukart/7.x

Revert "Merge pull request #112 from jordandukart/7.x"
Merge remote branch 'upstream/7.x' into flvc