Revert 63c79d1..0f2991e

This rolls back to commit 63c79d1ba355eeabf97ac4adaaf6e9e584c5d7ff.