Revert 790bf70..9c9eddf

This rolls back to commit 790bf705d16c5ef51d32c0667215efbcbda45e33.