Yes, please roll this change back :)