Revert a86481a..901d520

This rolls back to commit a86481a796735f8ca97cd6d12e680f84b5ec315d.
Revert a483753..4b45059

This rolls back to commit a483753cddecd16466dc879b808dfbb06339422f.