LPS-36491

Hey Alex,

I removed part of the logic you wrote for http://issues.liferay.com/browse/LPS-32347 although there shouldn't be any logic changes.

Can you please double check it?

Thanks!