Revert c056443..e9e27e5

This rolls back to commit c0564435ca1db05715d40dce37989cb1c8f71f62.
Revert b7de665..7b2586d

This rolls back to commit b7de66544071be4bd03782e467dffc4c4faaa423.
1

2