Revert "Revert previous 2 commits"

This reverts commit b6203669830f7d06e2b96393cd04f734e52daa18.