Revert "Fixes"

This reverts commit 654eeac6aad9e3be4710c8198318c079bbe9c893.

wq