Removed changes that were going one step too far