Revert "Master, Development"

This reverts commit a5dcaac8d16b9e160fe911a4306e4bbfcf29dc32.