Revert 217bd85..9ab2207

This rolls back to commit 217bd85f73db24b5f2073756681b22b3b5751be8.