Revert 122f969..53dadf9

This rolls back to commit 122f9693722e51cec7b3fc7a980b11442480c722.