Merge "Revert changes in fallback behavior"