Revert f732849..0a89ed2

This rolls back to commit f7328490490ab42f873e5c8eb1ab586f4cd87d26.