Revert 2651fc6..8cd1641

This rolls back to commit 2651fc6ffd733cd5bbf219671c665e5936f1055a.