Revert "mavrothal patch for new jwm template"

This reverts commit 964248ce6f6d041fd970684dcf8214c7fc7796a2.
964248ce6f6d041fd970684dcf8214c7fc7796a2 is a duoplicate of
 ff44f7d7b8680ecccf56ef24321d656bc001de91