Spike out 0.8+ compat