Revert f4cb5ff..d58caa9

This rolls back to commit f4cb5ffba37b07eae989ff3141a9035d3521673a.