Revert 0239f8c..4c05e5b

This rolls back to commit 0239f8cc51c6639a80ca33a2ac272e0aba2d26a0.