Revert 3f4600c..03d9578

This rolls back to commit 3f4600cea9eb541f38b29589a15644ad630cfa5f.