Reverting the Shielded experiment (it stays on GitHub): reverting r926-r929
Authored by: tart 2017-02-02
Parent: [r940]
Child: [r942]