Revert 81812cd

This rolls back to commit 1480edfdb1cd1468b153cdf2550384fd7a3584f4