Revert FACES-1900 erroneous commit b5eb937247cceed2f5c5325af9ea0c8bc0bdc357