Revert "1.0 Review"

This reverts commit 3b94f16dfe43dada5846ac33da8a2604dc06bcc2.
Revert "Revert "1.0 Review""

This reverts commit f7501555349797575d0d9608831c29a421efd153.