Revert 3292d62..6f4b8f9

This rolls back to commit 3292d622bee897b351c242b134b41d13e52e5689.