Revert a2fdad2..d734ec7

This rolls back to commit a2fdad2ef19d92ffc202bc53194df05e4a22eb1e.
durrrrr