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