Revert "Refine the ITs."

This reverts commit 4bf15b62de38d06b8d7e059711d89b0eca285296.