Revert 3784700..e449a3f

This rolls back to commit 37847000dfde8b684b077101c21260c143b83fb0.