Revert "Bug Fix"

This reverts commit 60437f920caa0a00bebdcdc6129e817ba91b34e3.