Lumber Hack (12050)

Fixes #4560
Revert "Lumber Hack (12050)"

This reverts commit 40ec7f7979cd65fccc6fe74c056688da4c4d47ce.
[DB/SAI]: Lumber Hack (12050)