Revert "conflict on log2 and realsqrt"
This commit makes no sense whatsoever. Looks like jtlap still has serious problems using git."

This reverts commit 2ace879d3d064139b8085e172a742504e9f3cbc8.