Revert "revert these while I test"

This reverts commit cea63512ad0320db16c856e4cb121f4968948586.