Revert 3c16a9d..4f43637

This rolls back to commit 3c16a9da2b269b96cf6abf6219d8022b33f80379.