Revert 620f6a4..be5e554

This rolls back to commit 620f6a48a8550084f9013a2187fe474c13837ecd.