Reinstating changes from !91 (merged) after they were reverted, due to other changes needing to go out while these changes weren't reviewed yet.
Reinstating changes from !91 (merged) after they were reverted, due to other changes needing to go out while these changes weren't reviewed yet.