Workaround Fixes

Removed workaround code.