Revert 26ced0a..e594eea

This rolls back to commit 26ced0a7948f8cb5d4c6065aa1ac8abfa81b9f75.