Revert ade62a8..5d70478

This rolls back to commit ade62a8276f16f426699e6669414dfa09c632297.