Fixes #6355

Not sure why it was commented it out, but it seems to be the cause of
the layer issues.
Merge pull request #6926 from mwerezak/pipe-layer

Fixes #6355