related to #539 (we'll need to remove the tests referenced there after this change.)
related to #539 (we'll need to remove the tests referenced there after this change.)