Revert "Friday Commits"

This reverts commit e6dc7707367f4fae1cee6ed6f49b77a5e60cd63c.