Revert d244af6..6d9c31a

This rolls back to commit d244af677766a1a36682b628fb9ff9a99a8e94a5.