Revert unused changes made in 58a367c