Revert bug workaround