Workaround for lp# 1370836