Undoing 89b9d4 since it breaks certain clients.