Revert d7fac66..b96b333

This rolls back to commit d7fac6619c20836160dc690febbb939f92788265.