Revert 38aa8f5..146e6f8

This rolls back to commit 38aa8f558d2b0dae8433411abb6ca2796b9c33f2.