Revert "Checkin of polyfunctionality code from Lynn."

This reverts commit 6bbd78adfbeb437b91d0db43cbf100729331a1bf.