Revert d713079..5a75b06

This rolls back to commit d7130797f2758c97ac1d4af5346aab58ddaf54f1.
Revert