Pushing reverted manual merge. hopefully it works!