reverted those. Ready to merge once travis signs off again?