Revert "t5 commit"

This reverts commit 19308fc9c9a428931dfad02df7a55e18d3316dbc.