Revert 2dbb0bf..c5969d6

This rolls back to commit 2dbb0bfd9b26e3c90914bf589cd95c133c946244.