Revert fe5b8f2..88393d5

This rolls back to commit fe5b8f2fe0e0c8fe32e10a9dee48d664458e9428.