trying to commit sync with latest code

.. in a semi drastic way..