Revert 0800d67..1e9cc79

This rolls back to commit 0800d677f5c90fa50fd19a4608485364adff0427.