Revert a51dbf1..87b477a

This rolls back to commit a51dbf1189764480413794b1e9885d845ae63017.