Automatic merge from submit-queue

Merge but disable unsafe conversions

This restores all the code but turns off the boolean that allows unsafe. Allows further iteration.

This is a simpler version of the revert that preserves the other improvements to the code.

@wojtek-t