Fix ability to pass in classes as streams
Revert "Merge branch 'refs/heads/2.3/develop' into 3.0/develop"

This reverts commit e1c931afab9e68caf13b03997d6346ca6b5169e5, reversing
changes made to 9c252cc10e0343be95bee76440264c508ad0cbe6.
Merge branch 'refs/heads/2.3/develop' into 3.0/develop