Revert "Merge Strangeness commit"

This reverts commit 03f64c5ce9bd42a02a1e27052b762cdb2b37a791.