Revert e5f6faa..0697f18

This rolls back to commit e5f6faae9c54530532b86d8da312911d882cc064.