Revert my previous commit, add some sanity checks instead.