Reverted to last known working state.

Today’s updates broke the test install. I temporarily rolled back to
yesterday’s SVN i6 state until we fix the problems.