Revert changes introduced by 8d23ff8618133ebae3df897aade799434bc570cc