Reverting changes #215