Large backport commit
that most likely breaks most functionality and
restores the code to the state at the abandoned commit