Revert 23a50a5..a4cbbca

This rolls back to commit 23a50a5b3604defd900877444e167d0c50adbc35.