Branch fix.

This branch somehow got merged with master and is no longer
the non-ARC version. This commit restores all files to the last-known
state of the non-ARC version.