Revert 072071f..eb4d55f

This rolls back to commit 072071f877844fd5d27862f1f0345ec0cb15150d.