Bug 1104272 - Build revised IA

All of this code has been reviewed in previous PRs.