Undoing merge. It breaks tests and does solve any problem I am seeing.