patch applied

This is an expedited request to get functionality back.  Tests to follow.