Revert e63502c..5832272

This rolls back to commit e63502cc879d979d2154b953af009d4f7184591d.