rollback 12571-12581

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12676 201d5d3c-b55e-5fd7-737f-ddc643e51545