AUI-1205

Hey @mjbradford89,

Attached is an update for http://issues.liferay.com/browse/AUI-1205.  Can you test these changes out to make sure they achieve the same results?

Please let me know if you have any questions.  Thanks!