Backed out changeset 274c9ce35ea2 to restore the Date branch. DONTBUILD