- Drop two domain related fixes that have been applied in vanilla.