Revert b59ff0c..8a4266b

This rolls back to commit b59ff0ca779d260da0d982d6f2bf5516ecff5229.
Revert 8a4266b..cafb016

This rolls back to commit 8a4266b10ddec6adc2affea4c6b0676fc3f8d9cd.