Revert "Remove trace statements"

This reverts commit 2ddbd340b1896e82e5d55f5985bd2c9191437338.