This reverts commit 2cffe9c8.
This reverts commit e6b88bb9.
This reverts commit 81e19e26.
This reverts commit 223e9419.
Acked-by: Ian Grant <ian.conway.grant@gmail.com>
This reverts commit 78a84cee.