Revert 14a807c..ead4ca9

This rolls back to commit 14a807cab9634fbca739611fbcd7da12ddfac0d0.