Revert "Comment out unnecessary Flag code, fix Zap"

This reverts commit 1ba350113067425ab21642098390be97d5488147.