I am ok with temporarily adding this here for now, as long as @jverghese is going to refactor all this stuff anyway.
This is an important bug so we should get a fix in as soon as we can.