Revert 03ccaf2..7bab0e4

This rolls back to commit 03ccaf2775b6f6f74ba8637a109daabe862c97fb.