This is a follow up to rBca935ab Differential Revision: https://developer.blender.org/D2442
601ce6a89c