Reverting some local changes that were accidentally merged.