Revert 659df26..932d05f

This rolls back to commit 659df26a5417f6476369ad03953fcd096544442b.