Revert c32fd1e..4786424

This rolls back to commit c32fd1eaedd5d382d135598c50db6512e02b5349.