This reverts commit e56347501d. No attached issue; Far to late in release cycle for people to circumvent the design process.
e56347501d