Revert 7458937..c3e9ebb

This rolls back to commit 74589376a76f89c42391b363f06471b7f26e624b.