Merge "Restore changes to WikiRevision that were lost in cdeba4cfc7c"