Revert "terrible change"

This reverts commit 6b4b89a5bff287d28cd327265e160ea819741f7b.