Revert Stencil Change - #4913 - acf4562

Fixes #4954