Revert 3c440d0..f891973

This rolls back to commit 3c440d00ce4023867be4fefaac7b327cd14a2488.