Revert 5705f97..e424c70

This rolls back to commit 5705f9764c659ea0f207846c0b68315009dff9fd.