Revert "Address review comments"