Revert ecd28ed..f17a41a

This rolls back to commit ecd28ed256fc543040713bd5b9269f6c6da5bd81.