Revert eb711c7..57eda5f

This rolls back to commit eb711c7901ebe4107d61a5b246b6bfe9d6fbc2d5.