Elementary: conform only use X stuff if we are on X
Elementary: conform only use X stuff if we are on X

Fix issues with shot.


SVN revision: 61589

FlorentRevest/Elementary,rvandegrift/elementary,FlorentRevest/Elementary,tasn/elementary,FlorentRevest/Elementary,FlorentRevest/Elementary,rvandegrift/elementary,tasn/elementary,tasn/elementary,rvandegrift/elementary,tasn/elementary,rvandegrift/elementary,tasn/elementary