include rest of revert changes + fix dependencies