Revert 6875ace..c28cc07

This rolls back to commit 6875ace87eaff78cf7c8d4802b05ed018e237696.
Revert c28cc07..a8ddf3b

This rolls back to commit c28cc077b35023e680b63dc2fa26963f6cafede1.