reverting change introduced in last commit that throws an exception