This reverts commit cbe6e0ba9b, which reinstates commit e4a5b85698. See !411 and !374
cbe6e0ba9b
e4a5b85698