Revert 45159dd..ae7790d

This rolls back to commit 45159dd55f3159f945269866f0ca6740e73ae7be.