[#RELBLDCMT-3: Remove static replacement]