Revert "Bug fix..."

This reverts commit 6af13769f7b05250063d46dd902df0361d3231ba.