Revert 32ee987..88ba29b

This rolls back to commit 32ee98711fb49c53f8609f9b8853d319fb2dd381.