Revert a6c4366..ee95195

This rolls back to commit a6c43669457077207c97a772579e29e0954829c0.