Revert 3f1db68..67d3a92

This rolls back to commit 3f1db68738ee680873866023dac2efe9aca735a8.