Reverted to working code. Fixed an accidental commit.