Fixes #6355

Not sure why it was commented it out, but it seems to be the cause of the layering issues.