LPS-48697

Hey @Preston-Crary,

Attached is an update for http://issues.liferay.com/browse/LPS-48697.  I added back the block of code.  Can you test to make sure I did not affect anything else?

Please let me know if you have any questions.  Thanks!