Revert "Prevent warning about ambiguous order of operations in BumpGrid.cc. Add" This reverts commit 8c0d064ab8d5f89654483308c764dc19e83a818b.