Revert for 3.0
Everywhere redesigned