Revert r235560; this commit was causing several failed assertions in Debug builds...