Revert eee33bc..40df4ba

This rolls back to commit eee33bc1509b2d3b53b46330d153133ba1fda673.