Revert "Store namespace as well"

This reverts commit b299faac65c1cd8e4a0cdbb312880585548a48ca.