Giving up now
Revert 2cccd59..89521bf

This rolls back to commit 2cccd596ba4830941b0e00382330ac4446932394.