Revert d1c26eb..e39bd85

This rolls back to commit d1c26eb4d287e056360f8528241d1d37f64fd51f.