Revert 50f98b3..d348d9b

This rolls back to commit 50f98b311d341d4d78637aef28f7ede2305bedce.