Revert 9098d18..ca7a699

This rolls back to commit 9098d18b0ce486f26f7aad731b543a3571915717.