Why this change? It looks like `nil` will return from this method anyway...