Revert "Merge pull request #2162 from ztianyang/level-fix"

The PR was merged untested and problems were encountered.

This reverts commit 65ffa36, reversing
changes made to b6079f9.

Author: Semphris