Revert 7f9342d..8f0eb08

This rolls back to commit 7f9342d3df45688de109fbfcc6f9486f20187dde.