Revert 4f0bf3a..7d6438b

This rolls back to commit 4f0bf3a9f8eb36a03057c3bb503111797ffd6306.