========================= DO NOT MERGE ===========================

Temporary work-around for unmerged bug fix.