Revert "Reverting some changes"

This reverts commit 3b8aab3564e1cf82887512e54ea76779410dcbb5.