Revert 8796c61..c39804c

This rolls back to commit 8796c61ba47651f7b7c17d3dd7640330948c787c.