Undo 7e0cec for now. Will restore later once I resolve issues