reverted and taking a less drastic approach for now