Revert "Bug Fix"

This reverts commit 9566d3cd1e38c66a831340e7c630399c402c1129.
Trying to fix things