Revert f850999..5def2f5

This rolls back to commit f85099931348110b67027c4d287046319491b863.