Merge "A header was pulled in for a function we no longer use, so we can/should drop the #include as well."