Revert 89e678d..3689160

This rolls back to commit 89e678d75f1dfd443078d53c8a54e480744440e9.