Reverted d1050dd267df67b065ed9c4f2ad077cbfddc8e61
Opens #935
Auto generated commit for version 3.1.81.192-Test
Auto generated commit for version 3.1.82.192