Commented out some code which was causing compile errors due to the
latest changes Jon made.