Revert "Review of this"

This reverts commit c1ad22266a2362ad8ed0a390385a07b69ee715d6.