Revert c2b4314..1f8d0bd

This rolls back to commit c2b43141ea11efc2175cc2cb87d22f713cb40106.