Reverted tuple improvements that cause Clang to fail in an impossible way

This reverts commit 01ceb47bce9c83f020deb2d7ef4fa68867387605.