Reverted stub class change