Revert 3a7b19d..90042e3

This rolls back to commit 3a7b19dada968ed03cea2d3b327f5547f006070b.