Revert 16bb568..58e3199

This rolls back to commit 16bb568af845eba1605f5d759cc48939f2429ebc.