This is a porting mistake from commit 0c76e685, thanks to Luke Horwell for finding the guilty commit. For more details see: !200 (cherry picked from commit 52b475fb)