Revert 03b9ae0..4e7e392

This rolls back to commit 03b9ae02cccf2e6ef61350d5e9c7cfb2f2379d75.