master-qa-7958

http://issues.liferay.com/browse/LIFERAYQA-7958

Needed to revert, because this update breaks our unit tests.