Revert 0f32fe7..c0ced7c

This rolls back to commit 0f32fe771c0592bb0af9c33069b0ca8871395585.