Revert "Bugs Cleared"

This reverts commit 4b63bbdf1127207981514877a8d6b4b06dcd0d83, reversing
changes made to abc705a8a888ba1a1e28357c6cd59a04fa80c9e9.
Revert 4b63bbd..d45bee5

This rolls back to commit 4b63bbdf1127207981514877a8d6b4b06dcd0d83.
Revert "Bugs Cleared"

This reverts commit 4b63bbdf1127207981514877a8d6b4b06dcd0d83, reversing
changes made to abc705a8a888ba1a1e28357c6cd59a04fa80c9e9.
bugs cleared