Revert c834fe4..a04dda7

This rolls back to commit c834fe4e345a6393752e1459b3595f7a8089362c.