Revert 62d6c77..821666c

This rolls back to commit 62d6c773c47745faf6726624fcde3c6fd7536e51.