removing verification of all the things.
Adding / @TODO: Figure out a better way to verify all the things.
Merge remote-tracking branch 'origin/6.x-1.x' into 6.x-1.x