Back out BI-181 changes