Revert "Post Review Fixes (in progress)"

This reverts commit 35fd0e6ef364bd37c97f3f185e6a1a561e97e87a.