Revert 1a17d90..10005d6

This rolls back to commit 1a17d909ce2ad1bd6b87861cc9613132613a0e15.