Revert 3d10ef0..dcad9ca

This rolls back to commit 3d10ef0c6c205536b9e52db1da98a86e598296fc.