UC-54 reverting code that somehow made its way into my branch