Previously disconnected from build system, and most code removed by commit 0b14a3a7 back on 15.08-pre1.