Revert 302409d..8122abc

This rolls back to commit 302409df80a930f6cff8384ae1b572a9c281554b.