Revert "Modified bug fix"

This reverts commit 4bd875442d64e4e47d5f9398db0768a0a7140f16.