Disable Flatten for now