Revert "leftover changes"

This reverts commit 6b5289ce13cbbc3c198f8ae0d839196e0fae47fa.