Reverting previous commit ddf6ba32705263e05accccec2bb1a8930289e8ab