Revert changes (unfinished, breaking change as-is)