Revert 71f8b34..06ae29e

This rolls back to commit 71f8b34698c41d29b22ae76bcb73edde49083df9.