Revert 45df7a9..d427091

This rolls back to commit 45df7a9685f73dd575036e2d2a4072f43cfc6a5a.