Apply jdf pull418

Applied the fix made by rhusar to the kitchensink-ear in pull 418.