Revert 3a6a7a3..16a5bf8

This rolls back to commit 3a6a7a38615c3001d2d78cb08d3d1086afdd1add.