Revert "emergency fixes?"

This reverts commit e01500fa9599525c9abfecd2aeb5ec38e3c8b20c.