Revert "fix problems"

This reverts commit 21e07506263d40d19c87bc469bc4f4374b6ccd57.