remove workaround... or we can hit revert on original