LPS-39451

Hey @drewbrokke,

We need to update the fix for http://issues.liferay.com/browse/LPS-39451 as this does not fix the root cause of the issue.  This only fixes the use case as described in http://issues.liferay.com/browse/LPS-39451.

Can you please check and resend me a new pull request?

Please let me know if you have any questions.  Thanks!