Resolve "If else wrap cb for review domain"

Closes #6007 (closed)

I had to revert my previous work on this branch after testing in production revealed problems.

Relates to !36418 (merged)