Revert "reverting #2259 temporarily until we figure out why logs aren't showing up"

This reverts commit 59b3e6f78fdcdb4dfbded9d65dfd58e08c0a6355.