Reverting commit as it broke 18 Journal tests

cc/ @NorbertKocsis. Could you please resend making tests pass? (please see here: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/32/testReport/). Thanks\!