Revert 03c2e8d..07774ea

This rolls back to commit 03c2e8dd94799b53572c62c99b776cab87d245a9.
d