Revert d640e59..b02e0cd

This rolls back to commit d640e5955605644d6b5536c5348ab30246ec330f.