Revert "added workaround"

This reverts commit e52ecb586d8424afbb4039bb5b48113297f61cea.