Revert "Error with previous check-in."

This reverts commit 442365667e23841ef5bfd51874ee4554bdf30f44.
Revert "Revert "Error with previous check-in.""

This reverts commit b660dd1172aa689fa07631558bf13c5a9a35ae56.