Revert "fix" for 2714. This fixes numerous other issues that cropped up.