Revert "Update Collection to master tip"

This reverts commit 7b8f52cc62f4f32818514f308eecf97e0d4d380f.

Change-Id: I71bfb8ddc821554957d0af73fedcde7d4e49d9af
Merge "Revert "Update Collection to master tip"" into wmf/1.23wmf8