Revert "this should solve the last couple pesky bugs and data properly now. didn't have domains for things"

This reverts commit afb849e8bccefb23c4d6ec73ebfe5f18b2418c98.