Revert 58a1a2d..e0389d6

This rolls back to commit 58a1a2d95adf1056231a19b4e1afd9c43ca8315a.