Revert dec1ecd..d396cf3

This rolls back to commit dec1ecd2e5f9b96dde4d7a09a7fd8617ae5f9080.