removed skips because of syncing master from 1.6