Revert 4ded460..c417d98

This rolls back to commit 4ded4602519d0341465ab668fa59746a63939133.