Remove unneeded <optional> include
(cherry picked from commit b1b2eee80dfee2e86edd833055fe7d06f1ad159b)