Revert "Bug Fixes"

This reverts commit 08d88b2cc537127240d7f39bfed12c9f9853e5ac.