Revert 4cc3e1a..8d42d04

This rolls back to commit 4cc3e1ae25c465ae15f16fb38d506933a617ca9d.