Revert 19814cc..a6c9c40

This rolls back to commit 19814cc6697fad1855ff765e09b2bb32af20a2b7.