Revert 64d496b..af3483f

This rolls back to commit 64d496b30541188b403444b0aeba9aa3de7c825d.