Revert ac3484d..f9e97d7

This rolls back to commit ac3484d2782762e5c32f31317a2381c91c565477.