Revert ce4b954..86a8f64

This rolls back to commit ce4b954cb88c3c0aa9a491a576390736e2fb9d8f.