Drop-in 0.151 replacement attempt