Revert 6a263ef..c2df942

This rolls back to commit 6a263ef860c03f2d1ad260fbf0e4dddcad2bf0aa.