Revert 48b0641..18da41b

This rolls back to commit 48b06413fb46a71b5a306faebae1489ecc90f693.