Revert to be0781d1039
Put a few more things back in order.