Revert "Fix all bugs"

This reverts commit 825dd75279c909233a4e2f43699050ffc245e2d4.