Revert 55e0f1d..1f2f28c

This rolls back to commit 55e0f1d8a31f9bdf83014cbd18026ad3f3389a53.