Reverting the last 3 commits. Behavior is not as expected

This reverts commit 8a3e1e0ff166c8a83aafba3342fd8af9fe52a680.