Revert 29bb1e1..6d56a96

This rolls back to commit 29bb1e1716f217e106c0b68c515cfc8ace28cf19.