Revert e812f2b..8e0eec1

This rolls back to commit e812f2bfe2952dd23b32f222363be0f26c04e9bc.