Reverted unnecessary fix