Revert 48885f0..1cbe2a8

This rolls back to commit 48885f0f82e736a43f58ff3701f6b4994ad2b0c2.