Reverts ff189599a67c2751e55c892decc4e89bd4eaa8bd

And 2cf8a124a0d1d41798b733cf41bc1ff3958e7cd2