Revert "Bug Fixes"

This reverts commit b50e43d876440673999f91e81cc64df0b31443a8.