Restored last changes to let tests to pass. Final fix will follow up