Reverting code to version 4fa4a122b8d983f24491af739654bd8739b60d9b