Revert 9d8c70a..5dabed1

This rolls back to commit 9d8c70a7e5668b9d9c9bd32aecc337d348dd507b.