Revert 514da12..ea9ed8a

This rolls back to commit 514da127369b631c21168fe32e418339913ad751.