Remove logic that was previously removed in 7098921 and was mistakenly added back