Revert 248d7da..6bf20f0

This rolls back to commit 248d7daa3ef8364e32bc14b1e3dcadfae4b9022e.
commit
Revert 6bf20f0..4943e83

This rolls back to commit 6bf20f05a6040b7f426e37eabae4db8152e9f2c9.