This reverts commit b89c5bc5818c62e775b0b0211931a81a32fd0293 and adds an additional test. Closes #5166
checkNoChanges
assertionsEnabled