Revert d9609a4..bf58338

This rolls back to commit d9609a4f2156478ce9a5e2071b0a0d23c038c44b.