Revert 720e12b..daf9d34

This rolls back to commit 720e12b8e23646dca64413ad2385498dc93f14bc.