Revert 6443787..ee0cf9e

This rolls back to commit 6443787761bcf06662f5a81e4c6f4a99d96a75f5.