Fix double include bug

MSP-11359