Oops; revert testing code