Revert 439dd23..085df1c

This rolls back to commit 439dd23946662d6685688f3241efe3290ace90ce.