Revert a8f695a..7d44721

This rolls back to commit a8f695ae3050f520d23be460a64ef48848efb86b.