Revert 5d17496..90832d8

This rolls back to commit 5d17496105e3665ddedd3393bc157c499f1233b3.