Add the .m imports back, however this breaks CocoaPod build. Looking into it!