Unscrew something that doesn't make sense

The probably makes the B/C work that never worked.

Found using PHPStorm's "Type compatibility" analyser.

Change-Id: I657c06aa7c8ef1ed5bc608a453f78adf0e04b375
Merge "Unscrew something that doesn't make sense"