Revert "UP-3624"

This reverts commit 690fb8f1e4036452bdc1893d8e1a3e76f457c5fc.
Revert "UP-3624"

This reverts commit d028ae7ddb7c9f393d38bd9440414f8b9f4bc174.