Revert "I3 build"

This reverts commit 290db3ac7a8712061fddbf5c7dba221a93fc1815.
Revert "I3 build"

This reverts commit 746ec90980f83d103aaa3cc2fda37e72ff04131d.