Readd usage of PreParser which got lost in 805d7a3a11945a7dd9883226a05cf6f7524881ed