po/todo: take note of the commit that will need to be reverted later