hhuijser/liferay-portal — pull request #1624 by jonathanmccann (2013-12-12 21:37:07+00:00)
Title: LPS-42800

Hey Hugo,

This is a partial revert of LPS-30383. Let me know if it needs to be done differently.

Thanks.