Revert 0c9bb59..52f6043

This rolls back to commit 0c9bb59b07f64684871a36de9b6c13361ff685e2.