Revert 8b56a7c..34aeb9b

This rolls back to commit 8b56a7ccbf2399e035dd87f7949f8113bd46bc73.