Revert 1245ea0..d0b4140

This rolls back to commit 1245ea0bdbe21c7c2e36db69b13c2f2276dd2391.