Revert f026d41..26ac20e

This rolls back to commit f026d416cb00982e8def2b62f35576f23a873105.
Revert 246dd9c..6528949

This rolls back to commit 246dd9c1f035c11cd15d5bd1ffc38480d276d2d9.