Revert 91fda07..083a3d5

This rolls back to commit 91fda07033654e30328c594996924db09259a476.