Rolledback the previous bugfix