Revert "code review hack"

This reverts commit c52db69916afccdf652c2cbe59c96d45b9b01951.