Revert 4d359b7..c22a685

This rolls back to commit 4d359b740b3c00b9683f6099c245b42747473a46.