Revert afaa98a..6f3b730

This rolls back to commit afaa98aac723cafbd228136384e8a68e405ae590.