Remove skips that are no longer necessary

Fixes bug 1098632

Change-Id: I972fa42e0b342e6e016272469894364e723ccce2
Merge "Remove skips that are no longer necessary"