Manually reverted to Larsens commit