Revert d37979f..2180bb2

This rolls back to commit d37979f19380da502c7398662e8df7ae3407b157.