Revert "Merge remote-tracking branch 'shopbeam/master' into fork"

This reverts commit 4c7fd7d8dc08468bb233c3bbb88e6d9e48d3c045, reversing
changes made to 74633e6c755cf06c715b20687ffc34f8c23ffab7.