Revert dbfef32..377b54f

This rolls back to commit dbfef3287911850bfcbe9582e6011fb1e841316c.