Revert 2bae405..8655e3d

This rolls back to commit 2bae4056220839f07bef02d88b303da0ecee481d.