Revert 24531d8..9a21b3d

This rolls back to commit 24531d84715cc0b44a45545e27b49cf16adc05b7.