Revert 94529fa..715f9d8

This rolls back to commit 94529fa02121a5042063eb73ff465678a6774c18.