Reverting 50929. Too many changes that don't belong and broke stuff.
Reverting 50929. Too many changes that don't belong and broke stuff.


SVN revision: 50979

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