Changed to accomodate findings in bug 895389.
Checking we are up to date.