Undid one of our 'optimizations' since it isn't needed.

Also, it breaks stuff.
Merge branch 'dev'