Revert 7b29fc3..aa6fb3b

This rolls back to commit 7b29fc3798ca04e25804425d28e33752bfed17cf.