got rid of the workaround we dont need it