Second attempt, avoid PPI and use plain ol' regex