Revert "fixes"

This reverts commit 91a2ed760680009ec32196d96ef50e17dfa1546f.