Revert 6640f90..9b9af54

This rolls back to commit 6640f904e1786642a8a6c1c3a0fde8dacae450ba.