Reverted to stuff that works.