Reverse the last commits, gonna work on them in develop branch