Reverting to previous commit to fix test failures