Revert 5b5f9e0..702f358

This rolls back to commit 5b5f9e0ead29682982376dde40903d63997ab7a8.