Revert df3e0ea..9d8dd88

This rolls back to commit df3e0ea32e2dd4706ecb8f973f7d382cce98b6c9.