Revert 5a84e26..c14bd9b

This rolls back to commit 5a84e26f457d69862f1f4646bf34d9e61ee26d4e.