Revert "Broken another test."

This reverts commit 61fb814b6c00713add34dcf9fcf30abf609e3c49.