Remove inline as requested by BDR