Revert d3b34c3..20f96d1

This rolls back to commit d3b34c371bf035565b5a4f48992c85a73b5362a3.