Revert "Added additional changes"

This reverts commit 43d7c46c01cab86a2c0d90071de7b2ebff3872cb.