Revert e792838..beeecfa

This rolls back to commit e7928385f9f41bda4864e2ebc34181a84804afbe.
Revert beeecfa..17bcb52

This rolls back to commit beeecfa39e93e90ac6b564d39ed2e79543167b46.