Switch back to internal push implementation