Revert "BUG FIX"

This reverts commit 17eeedfc10be0c1cce77b32e2b2edc5e46d74ccd.