Revert "Another Bug Fix"

This reverts commit 6a9d8d93cad147f937bc888106890510aea3409b.