roll back previous change, add design note about reason