reverted 1e4c1eca1077ab23e7d00524b54f09f9158b3617 to get a working debug toolbar