Revert 3c43eef..9c3f490

This rolls back to commit 3c43eefc86f94e4d1e9810bfada237c1037885d2.