Reverted changes because they aren't exactly what we're looking for