Revert d800181..8b8d755

This rolls back to commit d800181bf75f61464adb90bed584bd25f6a4cd5c.