This reverts commit d78cefb1. One of this and the SLT change broke set_shadow_test.c, so I'm reverting until I can fix it.