Revert "Fix bugs"

This reverts commit a164d27c1707427216047813b3e4b6e437adf7c0, reversing
changes made to 316c951ed58c6b15ab75fb435deae684ba1e16f7.