Working fork for Sentry support.