Revert 50dd467..1d100dd

This rolls back to commit 50dd467570ae3e5de10964ae428743af6b6bb630.
Revert d799fd7..42a6128

This rolls back to commit d799fd7e858fec8fe36839dfca04248874a9d561.