This reverts commit 9173819b71. The fixes for these issues aren't quite baked yet. Taking them out of 3.0.2
9173819b71