Revert fc42fcb..8f730cd

This rolls back to commit fc42fcbe0e9322f71f6273b13036a432a637384c.