Revert "code review hack"

This reverts commit 49afce964932ff559113adc3919e1e56387e888e.