fix for failing mac dashbaords

Moving a class caused an ifdef to start working that previously was
broken.  Turns out the dashboard looked better with the broken ifdef.
So comenting it out to match the prior behavoir.

Change-Id: If31d4efb698537a23a944e0c7f851358535bf847
Merge topic 'fix_apple_tests' into master

08d7b9fe fix for failing mac dashbaords