Revert the hack, implement the workaround for the core issue