Revert eb41d85..5cf52b2

This rolls back to commit eb41d85466b38002935eb8cc558314086dc35953.