Revert 5f3fbb8..00ed2c6

This rolls back to commit 5f3fbb8d06829d7e798eed1e1edba93bf608ae50.
c