Revert 1e40f73..0063586

This rolls back to commit 1e40f736ce6c8f52b826f20d8d0bc664ad281b91.