Revert "UP-3624"

This reverts commit b945f87d0e32b557212c43b28a9e11664edea5f4.
Revert "UP-3624"

This reverts commit 2ca8ec80e898f68917b45b328dda84e89b9b9ad6.