Put back some changes that Toby clobbered
API 15 required for Moverio