Reverting change in version 2