Revert "Bug Fix"

This reverts commit 4f761bcb3b1ebe6875d95b780ed67466d98a066d.
Revert "Bug fix"

This reverts commit 715a86ef62abbb9d4fb7681befcacc71bd26ad42.