Revert 0209dd9..dfe1da4

This rolls back to commit 0209dd988f01bbf7cdd48de11d4ea6d1790639cb.