Revert "multiple fixes"

This reverts commit 31a537ec45112f4261199be32b181e50eac69150.