Revert a6fb183..85d8c95

This rolls back to commit a6fb183fd50c0cae9e9fa67e2d209fdb921d4732.
...