Revert 35cd7b7..90af5ab

This rolls back to commit 35cd7b733cd34ccd955428747c886e9428f359e3.