This reverts commit 7540bc8e.

Conflicts:
	rsc/source/rsc/rsc.cxx

Change-Id: I7f89f7bf07f68e053d29283f659241aca8e48eed