Revert 595d3c7..ca34422

This rolls back to commit 595d3c749d363e92d88af0b1a17e27fa2853bbbb.