Revert 9793743..fed340d

This rolls back to commit 9793743fcb100bdd1289dad60dd51f40d89bbc5c.