Revert Ugly Revert Message 2/10

This reverts commit 4c328fdc31e217bbf7891fa749fb36b9d6849a06, reversing changes made to ba279e300be7c60edde39757e9d85c68d1c62f32