Re-add support for NoLayer mode but in its own class