Revert 6ca0ee1..4093405

This rolls back to commit 6ca0ee1dd7aa059a838e35e84731f36425e56bd7.