Revert 417b54f..06b353c

This rolls back to commit 417b54fff963c4c1329fcd55856c030e68c93f18.