Revert 99d6fe2..fafa6da

This rolls back to commit 99d6fe23da543c047f307b0fd2d25177ce6a53ef.