Revert "Reskin for 5.7"

This reverts commit da1e2fd8feb6836d6e3b8bdb1cba992b1b5dd376.