Closes #1116
This reverts commit a7cf968d04.
a7cf968d04
This reverts commit 8092e5c3a8.
8092e5c3a8
set_shadow
#983