Revert 3ddd3a5..22a8292

This rolls back to commit 3ddd3a52da9ef18ba826d62a046ec5115ffc1166.