Revert a431990..806e72f

This rolls back to commit a4319906a83ff312efe6173637c05c4576187046.