Revert 322d7ef..fbbd92c

This rolls back to commit 322d7ef9f6e24f16f520c02c0cbb3ac33e91257e.