Revert 8ec8d48..48e2b2e

This rolls back to commit 8ec8d48e5aa58d0b86a29b23334237b82e308ae7.