Replace last two check-ins, which were reverted (somehow I couldn't get svn diff...