Revert "This is a combination of 2 commits"

This reverts commit a88e24f4890905b00a141e84cdac34bea6a65ae5.