Revert "Merge branch 'master' of github.com:woothemes/woocommerce"

This reverts commit 5caf6b14981748e9d8d32afe739a82b7d70a5364, reversing
changes made to 558e2b22d163414d0094f4d649ccee0e4bb288a0.