Revert cade2a1..c8b7e7d

This rolls back to commit cade2a1e08edac2d06c0bc572b53666460b6b0ad.