Revert "revert these for now while I test"

This reverts commit 340b716a6007d438e6d5df4905dc797cf13096cb.