Reverted merge as it caused a regression