Revert 79bda2d..932b658

This rolls back to commit 79bda2d7f2f28198e991c44273735f691cf7a1aa.