Revert 1026254..26dc6a4

This rolls back to commit 1026254b56fd5673e07f1c935722425487d9094b.