Revert 6256071..b578abb

This rolls back to commit 625607197784a872901fab465e277af2134e4ec5.