Revert 02e784e..842592d

This rolls back to commit 02e784e887a4fa8a7c75e9065b9e88ed11423565.