Bug 1084090: Using as_document instead of serializable_hash to add/remove keys