Revert fb9f498..5deacbd

This rolls back to commit fb9f4984ddb16ad3723993afe9d5e02579acc8ab.