Revert 862bdd0..b889a6c

This rolls back to commit 862bdd0b928406e2fe0beaa34b10a3cbf419206a.