CORE-4857: Removed a lot of complexity that it turns out was
unnecessary.