Revert 85d3d3d..d9ced9b

This rolls back to commit 85d3d3dd40d0cebd858224c3903a12d6998d668d.