Revert "Bug fix"

This reverts commit 592fec49b19ae434cc6ba3a1746f8c1c8fe4df54.