Removed leftovers from first try to fix issue 5326