Revert 31d7f77..dbddf5e

This rolls back to commit 31d7f777a95bad458105573fb1f56422dc6e9820.
Revert f6893a0..5419d5a

This rolls back to commit f6893a06630a9cb42fe93a6b92ab2e9061836e85.
Revert 31d7f77..64d8683

This rolls back to commit 31d7f777a95bad458105573fb1f56422dc6e9820.