Revert 4ed0c50..f243d07

This rolls back to commit 4ed0c505a010b7c53f71473e219a21763ff80fc5.