Revert "Simplified I6 Inclusion"

This reverts commit 9367bc56c2edb0067adf117139c979603c139f65.