Revert b8b4960..8f65f3e

This rolls back to commit b8b4960e8182dd7a98d7fdaaa60125e7c2d93b41.
Review updates