Revert 738fd82..e5d4223

This rolls back to commit 738fd82c7fadf3e73d4739cdb77c3345dc3c9b02.