Revert "Merging"

This reverts commit d1ca696700a36211216a6c9d1530d81379b3aff1, reversing
changes made to 6370501cca5e28197b770d1ffa0e6ffa0551c4f9.

Github for windows messed things up. Reverting!