Temporarily back out outline support so I can implement it differently.