Revert acf0204..69cde5e

This rolls back to commit acf0204783948f5a4ff952992b6085081ea132e1.