Revert 8f4e750..598e246

This rolls back to commit 8f4e750ab90f0994c60bbc533c2bb71e9d9b367a.