Revert 6ed5adc..7c5a3de

This rolls back to commit 6ed5adc1876da56169d892a92c949057736f07f1.
trying to finalize
Finalized