Revert 1da17f0..6bf93e4

This rolls back to commit 1da17f08cdbb9893bba852a6ed1d13dfbad2cf29.