Revert the commit "bc85b4e" to keep the current solution