Revert 8153211..efcab0d

This rolls back to commit 8153211c6b40e61ab5bf25b87eeda3341257455f.