Revert "Bug fixes:"

This reverts commit a7cf30d981d08629b141a1431d04c7363ee44d1f.