Reverting the Shielded experiment (it stays on GitHub): reverting r923
Authored by: tart 2017-02-02
Parent: [r941]
Child: [r943]