Revert f9a9cce..287e014

This rolls back to commit f9a9cce573e64d0645e072ef3422d7a2d6023a6a.
Revert 287e014..a84c451

This rolls back to commit 287e014dac643ba5a9f8e2cce3ee99365ade9aa5.
Not sure

What this commit is doing.