Revert changes in fallback behavior